Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 26 Jun 2013 16:22:45 +0000 (17:22 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 26 Jun 2013 16:22:45 +0000 (17:22 +0100)
commit47a1d0b48ce3010c1b119541353cb1a7b5ed5de9
tree68788b39608c9179c8c8847f29172a71e73b32e7
parentb53f25e319d2d862b889260ccff6c8baea664a21
parentd0f535e9af564642250badf1fa300725ef996616
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging